[23.05] backport "luci-app-attendedsysupgrade: add x86 efi/bios case" (#6623)

* luci-app-attendedsysupgrade: add x86 efi/bios case

x86 is the only target that allows you to install either EFI or BIOS
images, thereby add an extra check for that.

Signed-off-by: Paul Spooren <[email protected]>
(cherry picked from commit d7e905e83a11d59ea217cd37189040bd6c9d403e)

* luci-app-attendedsysupgrade: fix search for x86 target

The conditional is wrong. IndexOf returns a number and not true/false,
so it does not work.

Signed-off-by: Miguel Angel Mulero Martinez <[email protected]>
(cherry picked from commit 021c4394871e062964e1601775f4c951d0e2b878)

---------

Co-authored-by: Paul Spooren <[email protected]>
Co-authored-by: Miguel Angel Mulero Martinez <[email protected]>

diff --git a/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js b/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
index af0b1eef7ad4ef93ee3cc82c2f71de3632834094..450af354967b78510c8b2e9130e83fd5b82ae6c3 100644 (file)
--- a/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
+++ b/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
@@ -88,8 +88,11 @@ return view.extend({
                let image;
                for (image of images) {
                        if (this.firmware.filesystem == image.filesystem) {
-                               if (this.data.efi) {
-                                       if (image.type == 'combined-efi') {
+                               // x86 images can be combined-efi (EFI) or combined (BIOS)
+                               if(this.firmware.target.indexOf("x86") != -1) {
+                                       if (this.data.efi && image.type == 'combined-efi') {
+                                               return image;
+                                       } else if (image.type == 'combined') {
                                                return image;
                                        }
                                } else {